From 055b5d83d517ebf800a0bebd4c2ee7e912ef95f3 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 6 Dec 2012 02:51:04 +0100
Subject: [PATCH] gtk: Use gtk_style_context_get()

... instead of soon-to-be-deprecated gtk_style_context_get_font().
---
 gtk/gtkcellrenderertext.c |  2 +-
 gtk/gtktextutil.c         |  2 +-
 gtk/gtktextview.c         |  2 +-
 gtk/gtkwidget.c           | 11 +++++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index e6e663a08b..fcb3f1b297 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1768,7 +1768,7 @@ get_size (GtkCellRenderer    *cell,
       style_context = gtk_widget_get_style_context (widget);
       state = gtk_widget_get_state_flags (widget);
 
-      font_desc = pango_font_description_copy_static (gtk_style_context_get_font (style_context, state));
+      gtk_style_context_get (style_context, state, "font", &font_desc, NULL);
       pango_font_description_merge_static (font_desc, priv->font, TRUE);
 
       if (priv->scale_set)
diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index d5a60c492b..a2811f2d3c 100644
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -298,7 +298,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
   if (values->font)
     pango_font_description_free (values->font);
 
-  values->font = pango_font_description_copy (gtk_style_context_get_font (context, state));
+  gtk_style_context_get (context, state, "font", &values->font, NULL);
 }
 
 cairo_surface_t *
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 38af09f04c..e3c1a576ec 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6919,7 +6919,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
   if (values->font)
     pango_font_description_free (values->font);
 
-  values->font = pango_font_description_copy (gtk_style_context_get_font (context, state));
+  gtk_style_context_get (context, state, "font", &values->font, NULL);
 
   gtk_style_context_restore (context);
 }
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9141a707f7..53c791a405 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8738,18 +8738,21 @@ static void
 update_pango_context (GtkWidget    *widget,
 		      PangoContext *context)
 {
-  const PangoFontDescription *font_desc;
+  PangoFontDescription *font_desc;
   GtkStyleContext *style_context;
 
   style_context = gtk_widget_get_style_context (widget);
-
-  font_desc = gtk_style_context_get_font (style_context,
-                                          gtk_widget_get_state_flags (widget));
+  gtk_style_context_get (style_context,
+                         gtk_widget_get_state_flags (widget),
+                         "font", &font_desc,
+                         NULL);
 
   pango_context_set_font_description (context, font_desc);
   pango_context_set_base_dir (context,
 			      gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
 			      PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
+
+  pango_font_description_free (font_desc);
 }
 
 static void
-- 
2.30.2